(smerge-check-cache, smerge-check): New var and fun.
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 10 Mar 2004 23:42:37 +0000 (23:42 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 10 Mar 2004 23:42:37 +0000 (23:42 +0000)
commite97ecb5e47d395aac6097e0db0d3e52ced06dffe
tree627b1439e598988f5f586f6fc0733e0b89558c4f
parent05e89cac301b4735c1e6085a6a94f79fdf01f4d5
(smerge-check-cache, smerge-check): New var and fun.
(smerge-mode-menu): Use it to deactivate menu entries.
(smerge-keep-current): New fun.
(smerge-keep-current): Use it.
lisp/smerge-mode.el